bitkeeper revision 1.1389.5.7 (4278a0a5VglnG7l7fg9gkM9E52ZXfQ)

Make slab.h not pull in other header files.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/xen/arch/x86/mtrr/generic.c b/xen/arch/x86/mtrr/generic.c
index e8d990aec79d1238dfd945e527acce9396e31fc2..4834266fbe73f941741291fc7520b4e9f8dc5472 100644 (file)
--- a/xen/arch/x86/mtrr/generic.c
+++ b/xen/arch/x86/mtrr/generic.c
@@ -1,8 +1,8 @@
 /* This only handles 32bit MTRR on 32bit hosts. This is strictly wrong
    because MTRRs can span upto 40 bits (36bits on most modern x86) */ 
 #include <xen/init.h>
-#include <xen/slab.h>
 #include <xen/mm.h>
+#include <xen/slab.h>
 #include <asm/io.h>
 #include <asm/mtrr.h>
 #include <asm/msr.h>

diff --git a/xen/include/xen/slab.h b/xen/include/xen/slab.h
index 71ff58334c7ffe9890d36c581e2a14f6588b35a3..c4c8231f78a2a54ed237689a5e1e359d5eaeba77 100644 (file)
--- a/xen/include/xen/slab.h
+++ b/xen/include/xen/slab.h
@@ -10,10 +10,6 @@
 
 #else
 
-#include <xen/mm.h>
-#include <xen/cache.h>
-#include <xen/types.h>
-
 /* Allocate space for typed object. */
 #define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))